Merge "Remove trailing empty lines in PHP"

diff --git a/includes/page/Article.php b/includes/page/Article.php
index a493854..a33c84f 100644 (file)
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -391,10 +391,9 @@ class Article implements Page {
                // Avoid PHP 7.1 warning of passing $this by reference
                $articlePage = $this;
 
-               ContentHandler::runLegacyHooks(
+               Hooks::run(
                        'ArticleAfterFetchContentObject',
-                       [ &$articlePage, &$this->mContentObject ],
-                       '1.21'
+                       [ &$articlePage, &$this->mContentObject ]
                );
 
                return $this->mContentObject;

diff --git a/includes/specials/SpecialUncategorizedcategories.php b/includes/specials/SpecialUncategorizedcategories.php
index 90dfdc5..77b6926 100644 (file)
--- a/includes/specials/SpecialUncategorizedcategories.php
+++ b/includes/specials/SpecialUncategorizedcategories.php
@@ -40,7 +40,7 @@ class UncategorizedCategoriesPage extends UncategorizedPagesPage {
        }
 
        /**
-        * Returns an array of categorie titles (usually without the namespace), which
+        * Returns an array of category titles (usually without the namespace), which
         * shouldn't be listed on this page, even if they're uncategorized.
         *
         * @return array